Merge branch 'deb/emacs/d/trixie/master' into deb/emacs/d/sid/master

diff --cc debian/changelog
index 8ac59267ed05db24e8d22d293ee6b4df63d178a4,5139e492c6bd4b09a0997ac1266b882cd1146166..95742725d98b483f3b2d25cea3daed1a5fedf2ce
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,10 +1,18 @@@
- emacs (1:30.1+1-6~1.gbpa971e1) UNRELEASED; urgency=medium
++emacs (1:30.1+1-7~1.gbpa971e1) UNRELEASED; urgency=medium
 +
 +  ** SNAPSHOT build @a971e1d025da05b8e8a8e8024a8354bc06159e3a **
 +
 +  * UNRELEASED
 +
 + -- Sean Whitton <spwhitton@spwhitton.name>  Tue, 15 Jul 2025 15:31:55 +0100
 +
+ emacs (1:30.1+1-6) unstable; urgency=medium
+ 
+   * Add Breaks/Replaces/Provides for builtin packages in this release.
+     See #1103033.  Thanks to Xiyue Deng for the patch.
+ 
+  -- Sean Whitton <spwhitton@spwhitton.name>  Fri, 18 Jul 2025 09:58:11 +0100
+ 
  emacs (1:30.1+1-5) unstable; urgency=medium
  
    * Disable emacs-module-tests.el (Closes: #1101598).